Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix SparseArray._broadcast_type #19576

Merged
merged 1 commit into from
Dec 13, 2016
Merged

Conversation

martinholters
Copy link
Member

@martinholters martinholters commented Dec 13, 2016

Use _promote_op and Broadcast.typestuple instead of
Broadcast.ziptype and Broadcast.ftype.

Broadcasting sparse matrices was rewritten to use Broadcast.ziptype and Broadcast.ftype in 840820d, but those were removed in 02596f9.

Fixes #19580

Use `_promote_op` and `Broadcast.typestuple` instead of
`Broadcast.ziptype` and `Broadcast.ftype`
@martinholters
Copy link
Member Author

CC @pabloferz

@martinholters martinholters added the bugfix This change fixes an existing bug label Dec 13, 2016
@pabloferz
Copy link
Contributor

Thanks. I thought there weren't more uses of ftype and ziptype (should have checked).

I guess the _broadcast_type can be removed replacing its uses by _promote_op + typestuple, given it is short enough.

@KristofferC KristofferC changed the title Fix SparseArray._boradcast_type Fix SparseArray._broadcast_type Dec 13, 2016
@pabloferz
Copy link
Contributor

Also, could you add a test so this does not go undetected again?

@martinholters
Copy link
Member Author

martinholters commented Dec 13, 2016

Oh, it made the tests fail. I guess each PRs last test ran before the other one was merged, that's why it went undetected. (Yes, our current master fails tests.)

@pabloferz
Copy link
Contributor

I see. I wish there was a mechanism to avoid this kind of issue.

@KristofferC
Copy link
Sponsor Member

https://github.com/servo/homu But IIRC it doesn't support AV which we need.

@andreasnoack
Copy link
Member

I'll merge this even though it hasn't been open for long to avoid test failures the whole day. If this needs adjustments, it is better to do from a state where master is not failing.

@andreasnoack andreasnoack merged commit 66ba9ca into master Dec 13, 2016
@tkelman tkelman deleted the mh/fix_sparse_broadcast branch December 13, 2016 11:58
@andreasnoack
Copy link
Member

andreasnoack commented Dec 13, 2016

Bisection suggests that the first problematic commit is 02596f9

cc: @pabloferz

@KristofferC
Copy link
Sponsor Member

For context to above. I previously had this comment here, but moved it to #19421

@Sacha0
Copy link
Member

Sacha0 commented Dec 13, 2016

Thanks @martinholters! This change was a planned touchup to #19518, so LGTM.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix This change fixes an existing bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants